Added strongarm and features and eva modules;