Make this a top-level class