Added support for charge shading and amino acids