ConfiguratorParser updated with comments