Fixed property name mapping and database reload issue