Better separation of tasks