Replaced obsolete classes with updated versions