Updated deps and the code; made properties local to each module