Fix properties management