further fields and address generation added