skill set enhanced with focus support - without tests
focus tests added