Changing to use ServletContainerInitializer