updated builders, refactored Map