Enhance/add coding rails