Feature/fix rest mapping