Updated implementation details