Capital, Revenue replace Plan and Non-Plan heads