Initial implemenation changes