WIP: Adding registration database