Making store endpoint more generic