Added state_from? Object support