Changed model to have unique identifier