Reworked objectives to be more extendible.