Enhance circle.yml