Moved correct methods to correct class!
Removed un-needed duplicate create definition
Removed dependency on Avid