Infrastructure improvements and new functionality