Added Class and Interface declarations (and required sub-statements)