Made picture class more typesafe