Small fixes in table generation and added a couple of setters added.