Added is_base to schema