Add to RuntimeProperties
Some fixes