Using file walker to load definitions
Bug fix

# Still need to implement and test recursive