Add field resolver instead of crapy interface with constants