Added feature to include specific trait class