Started work on implementing dependency support