Improve models and cucumber steps