Switched to using arraylists for the registry