Make setup more conventional (relying on tasks)