Added some structure and patterns