Added proxy model
fix merge
merged