New images and UserData class fixed