feature/extracosts-on-service