Fixed parsing for current classes