Adding support for multiple pictures
Refactoring