Add field sorting
Make an offical package