Added more store calls