Added classes and safer preload call.