Merge "Refactor model listing / selection code to support other types of model"