Updated Component Management
basic methods tested