Removed excess methods
Added gallery support