This should... be the right implementation

Signed-off-by: Stefan Marr <git@stefan-marr.de>
These methods should be final

Signed-off-by: Stefan Marr <git@stefan-marr.de>