Integrate identifier into launch and some small changes