Seperated rake tasks, and added spec structure