Removed files
Added sorting and changed field name