Contacts extracted to mixin
Updated copyrights