A better support for starred items (not fully tested yet