Moved interactions to map declaration
First part of implementation