Add config flags and loading checks