added option for client side storage