Some restructuring in properties