Changes for classpage implemented