Improve features rendering code
Enforce models constraints