Minor fixes in different places

- Subclasses added for Payload classes