Add support to custom units