Added resolving of home path