Updated component model and documentation