SCORSRVR-5. Update to work with ModelContainer

issue: https://jira.kiji.org/browse/SCORSRVR-5