Moved definability to separate file