Misc
First attempy to freeze internal API (hopefully good enough)