Some more changes and extended package structure