Added comments
Added event on field select generation