Added better support for custom obj dir