Added build script changes
Added AICO class changes