Added registration stuff