This is one sweet commit that adds full support for keywords and dependanices.