Update build system
Simplify interface a little