Move some logic between classes (schema: WS -> Service -> DAO)