refactored lookup of versioned and stateful model objects