Make some updates
Rewrite command decorator
Rewrite config API