Repair maven & added sorting options