Better support for accolades