Updateing configuration and scripts

Signed-off-by: Dimitar Atanasov <datanasov@gmail.com>