WildCard Implemented and other changes