Updated to work with latest gecko-dev