Class Setup Changes