Added auto-generation if field is empty