Removed dependency on gallery component