Big refactoring for express 3.0, release v0.5