Small fix and softcoded api updated

Finished for release v0.3