Update implementation to meet requirements