Made default mapping declarative and added calculator bundles