Last changes to make it npm-friendly