Critical updates to each class functions