Added/modified simple definitions