Moved intialization into object