Improved version of must class