Fixed exports, dependnecies