Fixed out of bounds issue
Added more support for Omssa Classes