Reimplemented the mapping functions for the new representation