Bug with handling of aiss, iss, use, cco, ccu, oss
Code refactoring