Bug fixes plus extension support