Add picture attr to record struct; refactor