More work on mod system