Added extensions to allow more fine-grained control