introduced own map wrapper with support of dynamic objects