Adding friendly id and other things