Added Table Reports and some small performance changes