Adding Skills support