Continued development on Xots processing. Improved class hierarchy and extensibility