Removed mapping, added closure based approach.