Fixing few issues, adding a base dir provider