to much improvments, decorators, big refactor for simplicity, new
context and few new components