Add definitions db fields conditionally (remove definitions dependency)