Luggage and Role needed a little bit of change