Added image uri properties
Refactoring of code