Improving development model a bit