Major environment handling changes and added load-from-path