Better method of mapping?