Refactor - Switched name back to MolHandler