Removed environment usage
Added dependency