Making methods public to be accessible
Enabling hot deploy
Adding singleton mapping name
Fixing lookups and initialization