Add more new features of 0.15