Moved functions into static class