Some modification in class/method structure implemented