Make extension friendly