Added state manager, improved abstract state