Misc tool classes added