Add return states for all implementation methods