#61 updated usages of setters and store method