Updated implementation files