Implement API
Fix merging conflicts