Adding requirements check and some fixes