Turned a few methods into static to avoid dirty singleton instanciation and access