Add Proxy Patter. Fixed Comments.