Added custom-image option