Fixed dependencies
Fixed format and pointers