Documentation and dummy behaviour improvement