Improved mappings and view builder