Added images handling
Updated ToDo