Some refactoring due to aliases added to SQLiteStorage