More work on modular system