Made updates to the concrete classes