Solved weapon types and simplified model factory