Added complex properties class