Fixed table name in references and refactored References annotations attributes