Added basic Model infrastructure