Add main
Align to spec