Change initialization order