First pass at support for defaults