Fixed dependency of datatypes