Update to common antlr grammer file, although required some modifications. Updated model adapters based on the new grammer