fixed addProperty and embed