Modified for configuration implementations