Implemented better parsing support