Added support for basic parsing that will be needed for the solution