Added callback features to State