Fixing the linking bettween XML and Classes