Images now stored in separete related class