Used properties instead of hard code versions T3-1195