Changed injection of factory object from parent to effective context, making it possible to avoid calling it's own methods all the time.