Add static factory class