Adding support for local database
Added bond attribute, still not super-convinced