Support for fields, ready for alpha