Implemented possible generic type mapping TODO: how to handle this inside update request?