#9 Add support for environments