Small improvements in development model