More additions & updates