mapper: moved mapping methods