Some gsoc enhacements