Updated interfaces for better readability