More declaration work