Removed attributes as field of table and added lookup instead