Recompiled with amber_core namespace