Cleaned interface, and simplified state transfer