Implementation of related declarations and clean up

- Move messages into bundle
- Add incompatible @ReadOnly and @WriteOnly implementation