[TASK] Added more field types and options