Removed potentially unnecessarily generic class