Adds temporary solution for primary_key magic