Adding starred functionality