Switched to using Static classes