Moved RDB prototypes to own branch