Added FN and Proxy modules