Use class instead of module