included external libaries
included external libaries and fixed imports