Added some CI compatibilty