Implemented proper dependencies for Makefile