Added support for custom asset dir, to include build and watch