Initial Commit for extension with v0.6