Changed all fields to use virtual field and not blackhole