Editing class structure for experimentation