Separating public API from internals; version 0.1.1