Non-primitive classes parser added