Updated from smcp-0.1