This commit was made after pictures module integration