Major improvements towards v1.0.0