Included 2 important settings and changed requirements files way