Completed implementation of type hierarchy consideration in parser