Important Class Updates