More improvements in abstraction

Signed-off-by: Herve Tatche <herve.tatche@gmail.com>