fixed package name and improved context creation