Update MultiStates function refactorization