Fixing model dependency initialization order