second commit, resources mapping added