Added model composition to 2.0