Changes based on circle ci support