Various modification to prepare future development