Added new class interface builder
Fix Conflict