Added some fixes and antigen config