Change load_by_query -> load, and add _init_defaults() methods