Added gallery support