Proper sorting
Updated dependencies