Add siyah's configurations + necessary changes