Fixed and extended class manipulation