*Package name fixed
*getId added (needed for the instrumentation?)