Refactor definition providers

Created by: felixfbecker