Change some signatures to be mixed rather than array