VIP Services added, renamed and moved some sql