Refactoring into class, 32-bit support