adapted to albers commit ce92d0f: removed Getters and Setters from Handles