Added support for join tables + missing docblocks