Modified to use this framework from root dir