Model and helper optimization
switch to unicorn