Added initial model setup