More work on parser for components