Moving some properties from public