Added wrapper

Added the expand wrapper to the parser.