More separation of concerns