Fixed issue with static class use of has key added has_default check as well