Added POS field and rearranged