Added component properties factorization