Removed some hard coded values dependency, need to clean it up tho

Signed-off-by: Exikle <dixondcunha@hotmail.com>