More Parser Updates

Setting up data types in parser for return