Some mod for OpenState implementation