Final changes for the composition based language