Implement usage of new options class

AVH Frameowrk has a new options class. We need to implement it.