Added helper methods that include port