Requirements and misc refactoring