Map to custom containers and added substitute extensions