Added adapter pattern to sources aswell xD