WIP: Pass-through credential types