Changed to static instantiation
Documentation