Added image support and separator support