Updated with parameterless constructor