Few feature additions