Add some fields to input and several changes