Add extra features

Signed-off-by: fassmus <Florian.Assmus@prodyna.com>