Better models
Fixed conflicts