Cleaned up in ScreenEntity interface