Split up map method, added extend