Improved locating base directory in create commands