Multi feature functionality added