Added own field storage hooks
Merged changes