Changed Reference import to a standard import
More changes to make reuse easier