Moved from main shutit library