Removed traits to be compatible with 5.3