Implementations updated