Added Gallery support