Make framework extension friendly