Changed info classes to use static sub classes for convience