Minor updates to reflect changes on UML model