Move to 'extend' static method