Fixed issue with shared models