Switching to generic container