Major improvements v0.3