Removed external types and converted them into inner classes.
Added disable and without arguments to configure.