Change Details

Avoid macros if possible. Maybe using inheritance like explained here http://stackoverflow.com/questions/1310214/register-an-object-creator-in-object-factory