Merged update forms into create forms