fixed to work with single _definition file