Fixed BrowseFactory to work with the new changes