Updated class extensions