Added mapper loading