Added a few fields that I consider don't have to be Dinamically added to properties + bug fixes