Map additions and optimisations, deleted Double classes