Moved to an object prototype implementation