Various changes and implementations