Refactoring (custom -> composite)
RDoc updated