Making schema more adequate
Merge commit '0fc07c8' into jooq