Added general options module