Updated few classes