Will be replaced with new implementation.