Add HETATM support