Added Autofield support