Updated to use relational DB IDs for select values