Changed store entry point to use factory pattern