Fixed property bag for a more convenient (programmatic) usage
Fixed version components for easier use