Fixed a lot of bugs for aspect oriented structure.