Adding support for custom targets