Added state_machine and user_friendships