Changed provider to ACE, fixed some functionality