Prepare for mono-lib conversion
Pre diagnosis prop