Updated Init/PreInit to new Annotation/Methods