Second stage of feature additions