Polishment for v0.7.0 milestone