Better Class Path consistent with future releases