Edit classes to fix default null option