Updated from smcp-0.6.1