Updating Imports and Model Type