Bugfix: Add with statement, getter and setter