- Moved from active records to service