Removed ref variables and implemented standard cml id references