Updated static calls to use 'static' keyword instead of 'self'. This allows these classes to be extended.