Updated to use components (develop branch)