Extended support for additional fields
memory management is a bit flawed?