Adds transient dependencie support. Minor fixes