Fixes and additional dynamic values.
Added dependencies