Added high lever signals
fixed circular import
Handled unknown location types