Service catalog remake