Add alias support in v0.6.x