Further changes and enhacements