Codebase updated to support >= 0.2.0 version