Added a bit more flexibility for developers