Included all necessary additions to .h files