Some improvement on design
@Todo Next episode