Move to system.prop