Make few more field transient