Added token controller. Renamed userId to _ownerId in objects