Fixed build depends, TODO: Submodule framework