Added commandfields to edit fields