Initial sol-11 support