Port more classes from the pre-alchemy codebase