Added base for components API;
Fixed conflicts;