Added image option and some duration features