Added further CI build support