Added to fields to source attributes of Features datatype
Added minor bugfix