Added handler for id and uid