Update for better management of relationship