Registration refactor and bootstrap