Updated to Normalize Interfaces