Updated composite keys