Updated against 5.5.9 and added more extensions