Adding in Attribute.java and Relation.java