Updated to be compatible with Node library