Added class methods custom parser