More implementation changes