Make sure correct properties are enumerable
Fix enumerability of models