Added migration functions and merged conflict