Moved into package object