FIX: Update class properties to be public static.