Continue migration to container class