Update to be more express integrated
Release 1.0.0