Have to move these classes later, because they get automatically picked up by Spring data which causes confusion with the deprecated ones in commons.