Push scale up to types

/cc @senny