Class Updated as per to reflect standard...