CHANGED Removed remains of the previous mapping approach and got rid of NSCopying