Added mapper interfaces