Use more appropriate data store methods