Improved State functionallity