Better requirements declaration and doc notes