Version 0.92: add more