Method Container added + fixes

+ Method Container
+ final Classes