Update method does not respect custom mapping schema
Merge branch 'pr/n156_starteleport'