Improve behavior of define on Model