Adding #unmap to resources
Nicer field constructors