More app model changes