IMPORTANT UPDATE: Major change to how credits are charged + Alias support