Add enum expedition and wrote other function in classes