Added support for different prefix in system settings