Updated with Default Constructor