Change to static methods because problems with stateless (AISVIEW-37)