Added user specific image handling