More Endpoint sub model changes