Fixed custom fields support, such that it properly observes the sdk architecture.
Had to merge here.