performane and interface improvements