Added initial support for functional groups (methyl etc.)