Adding various features
Signed-off-by: Paul Chevalier <paul@paulchevalier.org>