Added kit related stuff