:green_heart: Separate trait to file for < 5.3