Changed id and table fields
Some cleanup