Addressed comments and moved registry around