Updated to include dependencies