Code seperated, model transformation, and grammar changes