Moved to internal puppet module