Made use of the new options module :)