Updated constructor and run method.