[Added] images
Refactoring