Add static methods where they should be :)