Added several options handling classes