Updated with new properties