Added analysis options class