Some Initial Modifications in classes