Add support for subdirectories within entries