Applying proxy pattern instead of identification
Authored by: phoubaux 2012-11-23
Parent: [r1592]
Child: [r1594]