Added dynamic importing of files