Add 2 more planned features.