Remove the inclusion of the diamond class
Fix the parameters