Last user class refactoring